moving ui stuff, fixed small build issues