Working rerender but not very nice