refactor pages
Prepared for buttons
Added test of button between lines