Fixed layout and smaller issues.