Layout refactor

Replaced all of the sp's with dp's except with text sizes