Styling, Form & Test

All changes are ready to be merged without any conflict