layout and styling cleaned up