Styiling issues

Fixes to:

https://github.com/Eduki/eduki/issues/130
https://github.com/Eduki/eduki/issues/124
https://github.com/Eduki/eduki/issues/122

@DavidMah @abboudm