Optimize the UI. Remove unnecessary layout nesting