FE :: Redoes layout logic and adds page title