more work on layout and styling