Adding fixes to layout