GUI revamp