Fixed minor issues
Merge branch 'wiki-merged' of https://github.com/re7eal/chula-lounge into wiki-merged