Add missing dependency
Clean up api usage a little
Fix some rendring issues