fixed bug, need to rework a few things, form css js