GUI enhancement and TODO updated