Bug fixes and UI plused