Slight layout tweaks, refactoring