Refactoring and added skeleton css framework