fixed watchlist not expanding issue and removed a lot of unnecessary js code
style and template changes to make design a little more organized