Additional work on base.html and custom.css to get the right design