cleaned up ux