Removing unnecessary parameter being passed about
Reorder html and css creation for readability