refactoring page actions & fixing css issues