Code refactoring, css changes
Code refactoring-2