Cleaned up UI + pages controller