Remove react-router-component, style tweak