Issue no. 3 - solved and added custom flash messages