Bug fixes, prettier rendering