2nd post, some refactoring & layout tweaks