Reorganize images
Work on chatbox