Add dependencies
Resolve missing payment options bug
Code styling and general clean up