fix look and feel for screens on low resolution
fix layout of property input field and fix cancel button
merge