tidy up code. added icons