Frontend bug fixing by Uros Stojanovic