Some fixes in theme by Ivan