Layout and styling imrovements