Revert af23f76..c47643e

This rolls back to commit af23f764cf8305597f891ecfe700955f020c29fe.
Revert "Revert af23f76..c47643e"

This reverts commit 4f1fc0e671b1ef1b52090032e001a54db5732d0a.
GUI outline completed