WIP - Issue#30 

I kinda sorted this layout and I think is more readable than before but maybe changing to different layout is better solution? What do you think guys?