UI Changes  - general cleanup