tuning UI, code cleanup