More UI fixes

This is the continuation of PR #74 and #76 

Thanks for bearing with me today, should have noticed all those "hands!" instances earlier