Align topic form fields

Change-Id: I1638ff60c565d4143416b7221991b67c88d490ad