refactoring styles and added some elements