Added UI tweaks + manual merge from testing