17 fixed styling issues