Some extra gui features & cleanup