Major UI revamp by chdabre