Minor changes

altered controller so parameters appear at the top instead of being in
function calls.