Fix layouts, fix path image and alert message