Fixed formatting, addressed GUI construction