A tons of improvements!

Now it get displayed correctly!