Refactor/create consistent look