Created better button logic
Merge pull request #12 from DiogoNeves/feature/better-buttons

Created better button logic