Second Pass Through

Still some issues with buttons and alignment.