Updated setupLayout
Updated GUI