Correcting for desktop users
Refactoring
Icons and styles