Fix some bugs and look issues