changes layout in main.xhtml + small other changes