Fixed up some wackiness with tabs and fields etc...