More GUI tweaks and twer- err... fixes...