Minor UI Changes. Refectored code.