Rewrote the Design to use Material Design