Bug and Layout fix