Major updates to provide initial GUI