Fixes /design changes are implemented!