Fixed bug with extra image loading
Removed unnecessary code
Fixed cell layout
Set edges for extended layout