Few layout tweaks and remove some cruft