Managing minore issues
Admin console minor issue fixed
Merge remote-tracking branch 'alvaro/master'