New design + fixes