Alignment and sorting
merged development
Merge pull request #21 from cennest/task/UIAlignment

Task/ui alignment