Rename api methods
Redo layout. Make pretty.