Added image, more layout work