adding ApplicationController, + whitespace fixes