Adjust main scaffolding and make it more responsive