UI improvements and removal of un-needed functions due to last commit