Fixed some UI bugs, more work on favorites