Added logging
Fixed layouts on dialog UI