Layout work in progress; I'll finish this up tomorrow.
Merge branch 'concierge-refactor' of https://github.com/browndav/medic-os into concierge-refactor