Styling, Form & Test

All changes are ready to be merged without any conflict.

Has code from pull requests: #139, #93, #132