some rearranging the file, js is cleaner, some UI tweaks, gotta go make coffee