Refactor gui layout to better follow IxD principles