split controllers up, added partial style for different states