Refactor : Custom msgs displayed, moved some code around