Added image interaction and fixed overflow