fix some function
Merge branch 'master' of github.com:nguyen-tinh-mulodo/AlePlace

# By nguyen-tinh-mulodo
# Via nguyen-tinh-mulodo
* 'master' of github.com:nguyen-tinh-mulodo/AlePlace:
  edit layout