Fix bugs and appearance