Reworked buttons to appear when needed
Testing a few more things