Made some changes to layout, implemented Menu