indent sessions controller
add buttons
merge dev