Code refactoring, bucket functionality, slide functionality, ui fixes