added flashes partial so all types of flash messages are now displayed
merged in changes