Added pretty rendering and fixed some small interface problems