changed functionality of buttons - still not loading well