major ui improvements!