Fixed some layout and encoding problems.