fixed flash and form messages
added new layout files