fix styling
re-organize keys