Fix general positioning problems.

Change-Id: I64d63de63f06e5eb0ec7f6feb8fe327f3dab556c
Signed-off-by: Manuel Bachmann <manuel.bachmann@open.eurogiciel.org>