Changed GUI building to layouts