Base: Fix CSS issues