added some more flash notices and improved layouts
adding addtional flash messages
fixing merge confilcts