cleaning up and loads of styling adjustments