Reorganize, finish forms styles/doc