Small rework of main pages  and menues