Text box position fix
Margin fix
Small fix
Merge remote-tracking branch 'chris/devel' into anontunnel
Merge remote-tracking branch 'chris/devel' into anontunnel
Merge remote-tracking branch 'chris/devel' into anontunnel
Fix