Added composition pages and flash messages