595-21 some rework

Made type selector page to be similar to the amounts page