Update base styling
Various fixes