Improve controller page skeleton