Refactoring attempt 1 - also refined uilabel apperance throughout app