Fix some bugs & typos & layout errors