refined layout, finished initial version