Design updates & improvements