Adds payment view and some small fixes