remove column1 and column2 layouts and move them into main
add flash message styling