Fixes important UI bugs
Merged Changes