Added UI tweaking and Settings