Some layout improvements and css work