Renamed running file
Added a few features
Minor UI improvements