Manage Page Controller update + minor changes