some fixes and add base styles