Layout refactoring, overal cleanup. Looking good