Mostly finished .js logic, style and html changes, too