Fixes #188, tab menu overlap of content (also has code clean-up)