First batch
A lot
Merged
Merge pull request #25 from tiagom87/design_tweaks

Design tweaks