Small GUI adjustements, see #12