css updated
socket JS listeners added, push logic reworked
conflicts fixed