Frontend improvements