Tiny tweaks of frontend