Messed with index

Made it look more like the design, cleaned up some code, etc etc