- Removed unnecessary converters.

- Fixing some layouts.