Few layout tweaks to clean up the design