Deb 0.6.1 rc2

merging latest UI changes