revamp gui, access control
minor rename