Code Review. Updated UI