begin side-layout; remove test link
buttons, layout
Merge branch 'side-layout'