add overview and heavily reformat layout