Add flash messages. Reorganize views.