Error Fixed and UI Changes Made