More styling, bug fix in refresh