0.0.15 - improve look and feel