Changed layout, added flash notifications