fix styling and ordering