major ui improvements