Moved presentation logic to client side