fixed button issues, added borders to buttons