Fontend improvments