Signed-off-by: Peter <mcheung63@hotmail.com>
WrapLayout not working, removing it

Signed-off-by: Peter <mcheung63@hotmail.com>