Simplify if conditions
Increment version
Graphical improvements