ADD - Layout vars and design comments