Finalize layout
Rearrange Frontpage
Add ROLE check
Remove usless check