Design changes
Merge
Conflict fixed, pretty buttons