Small visual changes
Split managers from models