Merge pull request #2 from consolving/master

getting latest changes from master
Code Cleanup, adding payed Button, updating Payment detection.
styling updates
Merge pull request #19 from phaus/master

updating styling and payment detection