Updated to fix some UI bugs