fixing bugs
Merge branch 'master' of https://github.com/Fathalian/nestor

# By Zaryafaraj
# Via Zaryafaraj
* 'master' of https://github.com/Fathalian/nestor:
  style and layout changes