Layout errors fix