Fixes Form Layouts;
Renames Routes to Controllers;

Signed-off-by: ashwinh <ashwinh@cybage.com>