Trying a new design
Extra design changes
Merge remote-tracking branch 'origin/new-design' into develop
Fix for config finder.

I don't know how I managed to write this... I swear I wasn't on drugs!
Improved design