02.10.14 - ui changes, code cleaning