UI fixes!! (with images!!!!) possible conflicts
Merge remote-tracking branch 'origin/master'