Code clean up and building slide out tool bar