Fixed includes

Also messed with original designs, adding interactivity