make things look nicer, componentify some things