Only register events for base layer
Fix style issues