GUI revamp stage 2