Further frontend tweaks