Fixed default images and multiple minor UI changes
Fixing merge with UI changes