add 2 column layout, more coding standards tidy up work