Fixing class name and adding margin to controllers