css update, js organization, bug fixes