transfered front end work from other project to this one, slightly imporoved it.