Fixes minor UI bugs