(refactor) Refactor view with new layout and color scheme