Little changes to design
Merge origin/development into development