Improve the Critical / Penthouse section