UI fixes

Add some free stuff