Small look improvements.
Cleanups.
Changed IDs.