refactoring + binding
forgot to delete some unnececary code
fixed gradle errors