Refactored frontEND structure. Make it extremely easy to fix.
Merge remote-tracking branch 'origin/master'