Design refactoring.
Layout refactoring.
Ready for livetest.