Minor visual bug fixed, layout refresh