Fix: Translation issues, layout problems
Small fixes and removed imports, added some JavaDoc