lots of commits to improve visuals