Remove second base layout
Add simple payment support