Fix bugs and UI Issues