bunch of layout tweaks to make it clearer what is happening