Design changes + hopefully shake fix