Added progress indication, some ui changes, some minor bugfixes