Refactoring and some minor layout changes