Added a few Fixes and UI elements