layout and design fix