layout tweaks and method refactoring