fix transition and style issues, update base