finished 66% layout, fixes #2