Trying to revamp the layout. Finish some build issues.