Smaller fixes regarding layout and forms

Signed-off-by: Hendrik 'Xendo' Meyer <butterkekstorte@users.noreply.github.com>