added custom messages and new layout