Small bug fixes

Also includes some home screen changes