Small UI fixes
Finilizing merge