Matt 'Cleaned up' GatewayFormChooser aka Went Crazy

Uhh... so ya... only needed to allow gateway filtering and then
decided things looked ugly... Not sure if this ended up any better
though.

Change-Id: Ib61d1486806b9cce4e39cadfadf8e83c22fd4692