Refactor code so as to reduce technical debt for sprint 4. Also add some styling to certain components