changed layout for Initial Setup and Basic Form