Refine styles, move to jQuery