Fix motion pages, modify the layout a bit, fixes #17