Sorting bugfix & material design #1 (2.0.1.302)
Material design #2 & optimizations (2.0.1.302)