ui improvement and cleanup....