Removed more fixed stuff for tabs, etc.