Subviews UI refactored