Added Fixed layout
Pre-adapted some of the widgets