frontend tweaks
resolve merge conflict