Handle buffering state + added search to old sytle menu + js code clean up