Import logic added
layout impoved for flashed message