new layout and fixes