UI Fix

Minor UI fixes