Refactor view for better design