removed old code and added button binds