Make layout flexible
Fix conflicts in core.css