update css

and enhance layout options