working on the layout and some image problems