Updated deps, simplified css and layout