feature #2746: Fix layout for small screen size
feature #2746: Fix undefined message string