Changed Main UI &  improved run fn