Minor code refactoring and responsive styling;