work in progress optimizing and styling - general polish