Cleanup trash, add pages controller