still shuffling and fixed loop for slideshow
fixed some loops and spacing issues