Updated GUI Layout