Code Refactoring + Minor Interface Change

Rearranged some part of code in the controller file to clean things
up.
Changed the atom from an asterisk to a certificate shape.