A more mature layout with a couple minor css fix