Some fixes in theme