more tweaks and added more design attributes