Fixing basic layout