Added all button labels as parameters so everything is easily configurable from within Marmalade.
Removed dead code, cleaned up other inconsistencies.