Improving frontend