Refactoring and changed the look and feel