Continue work on layout & design