reverting bad changes by ex-contributor
fixed base styles
added block borders