Tweak organize screen
add flash messages