Update 2.0

Updated to version 2.0 with some ui and performance enhances!