rearranged app-controller and finished profile layouts.