Updated logic and styles on some files.