Added the latest Flatlands changes to Natew's small tab tweaks