Small tweaks to allow for better UI