Starting improve general layout