I think re-vamping the layout could be beneficial.
It currently is a bit confusing to navigate unless one is an everyday user.