updated layout and design