realigned controls, use some Tabs