UI improvements, still editing/update mess