added progress bars, ui fixes, removed redundant code