clean up website layout, add flash message in correct place