Refactor main views adding sections