improve layout some
improve layouts more
improve pay module behavior