Cleaned up all the code and made formatting uniformed. Minor UI Changes