Rename and add docs
Some layout fixes