[WIP] Some Code polishing and CSS adjustments