fix minor bugs & update theme