Updates

Changed aesthetics and prevent lots of crashes