More work on frontend part