Fix margins and display problems.